API: remove gdk_window_set_icon()

gdk_window_set_icon_list() now does everything gdk_window_set_icon()
used to do.

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index c60c9d03968642941048a923752f8d5ee87ad930..003ec70b05746baaa850dd890a090b50af5a4ee5 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -508,7 +508,6 @@ gdk_window_get_children
 gdk_window_peek_children
 gdk_window_get_events
 gdk_window_set_events
-gdk_window_set_icon
 gdk_window_set_icon_name
 gdk_window_set_transient_for
 gdk_window_set_role

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 99e0da1efa430e0e3e4f7cbcd381d48efba48483..d663f5f07b03559da93f23fbd3d4bb9548cbf036 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -714,7 +714,6 @@ gdk_window_set_override_redirect
 gdk_window_set_accept_focus
 gdk_window_set_focus_on_map
 gdk_window_set_icon_list
-gdk_window_set_icon
 gdk_window_set_icon_name
 gdk_window_set_opacity
 gdk_window_iconify

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index a9e71e826b24409f1cefca7a1e530573b03772f7..2724c05c207eaf823d7cf6cf581c8ab9660e0b44 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -767,10 +767,6 @@ GdkEventMask  gdk_window_get_device_events (GdkWindow    *window,
 
 void          gdk_window_set_icon_list   (GdkWindow       *window,
                                          GList           *pixbufs);
-void         gdk_window_set_icon        (GdkWindow       *window, 
-                                         GdkWindow       *icon_window,
-                                         GdkPixmap       *pixmap,
-                                         GdkBitmap       *mask);
 void         gdk_window_set_icon_name   (GdkWindow       *window, 
                                          const gchar     *name);
 void         gdk_window_set_group       (GdkWindow       *window, 

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 083ce5873bfaec35b3cf1f23ac84d571e78856bf..117c42411398b314c5eaf8dc3880acdae78e91fd 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2282,15 +2282,6 @@ gdk_window_set_focus_on_map (GdkWindow *window,
   private->focus_on_map = focus_on_map != FALSE;
 }
 
-void          
-gdk_window_set_icon (GdkWindow *window, 
-                    GdkWindow *icon_window,
-                    GdkPixmap *pixmap,
-                    GdkBitmap *mask)
-{
-  /* FIXME: Implement */
-}
-
 void          
 gdk_window_set_icon_name (GdkWindow   *window, 
                          const gchar *name)

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 0733e0c5a1ee33c451c11101b636bc210cf9222c..7ec3c98fbc8bb16a40464d71d7033f69d31fcc2e 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -2283,17 +2283,6 @@ gdk_window_set_icon_list (GdkWindow *window,
   impl->hicon_small = small_hicon;
 }
 
-void          
-gdk_window_set_icon (GdkWindow *window, 
-                    GdkWindow *icon_window,
-                    GdkPixmap *pixmap,
-                    GdkBitmap *mask)
-{
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  /* do nothing, use gdk_window_set_icon_list instead */
-}
-
 void
 gdk_window_set_icon_name (GdkWindow   *window, 
                          const gchar *name)

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 154830d91f95e2de23f873796347877867c1488f..be8e1157b253e3b48af4add551b5fd64d9b9f7c7 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -3787,29 +3787,6 @@ gdk_window_set_icon_list (GdkWindow *window,
   gdk_window_update_icon (window, pixbufs);
 }
 
-/**
- * gdk_window_set_icon:
- * @window: a toplevel #GdkWindow
- * @icon_window: a #GdkWindow to use for the icon, or %NULL to unset
- * @pixmap: a #GdkPixmap to use as the icon, or %NULL to unset
- * @mask: a 1-bit pixmap (#GdkBitmap) to use as mask for @pixmap, or %NULL to have none
- *
- * Sets the icon of @window as a pixmap or window. If using GTK+, investigate
- * gtk_window_set_default_icon_list() first, and then gtk_window_set_icon_list()
- * and gtk_window_set_icon(). If those don't meet your needs, look at
- * gdk_window_set_icon_list(). Only if all those are too high-level do you
- * want to fall back to gdk_window_set_icon().
- * 
- **/
-void          
-gdk_window_set_icon (GdkWindow *window, 
-                    GdkWindow *icon_window,
-                    GdkPixmap *pixmap,
-                    GdkBitmap *mask)
-{
-  return;
-}
-
 static gboolean
 gdk_window_icon_name_set (GdkWindow *window)
 {